Merge branch 'master' into deldthrf

diff --cc CMakeLists.txt
index 1a776053f40407a04fa8562994e4ca4b329d411d,02068a9475eff71ca888b807ee157b7353301a1e..302fed5183eb49724dec5a3f0d8a9ca8b9446c11
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -83,10 -83,14 +83,9 @@@ set(MINIMAL_FMT
  set(ALL_FMTS ${MINIMAL_FMTS}
    bcr.cc
    brauniger_iq.cc
-   delgpl.cc
 -  destinator.cc
    dg-100.cc
    dmtlog.cc
 -  easygps.cc
 -  energympro.cc
 -  enigma.cc
    exif.cc
 -  f90g_track.cc
    garmin_fit.cc
    garmin_gpi.cc
    garmin_txt.cc
@@@ -399,7 -397,7 +390,6 @@@ set(TEST
    classic-1
    classic-2
    classic-3
-   delgpl
 -  destinator
    dg100
    dmtlog
    dna

diff --cc GPSBabel.pro
index 7627e857c8f89d298466da5a57f6e0de785e481d,413e64bf02c2fb105da7a73c72a9121a3160ff8e..421babc25c00a7d582f483ca3ebf867f2acb6c9e
--- 1/GPSBabel.pro
--- 2/GPSBabel.pro
+++ b/GPSBabel.pro
@@@ -58,9 -58,12 +58,8 @@@ MINIMAL_FMTS = 
  ALL_FMTS = $$MINIMAL_FMTS \
    bcr.cc \
    brauniger_iq.cc \
-   delgpl.cc \
 -  destinator.cc \
    dg-100.cc \
    dmtlog.cc \
 -  easygps.cc \
 -  energympro.cc \
 -  enigma.cc \
    exif.cc \
    f90g_track.cc \
    garmin_fit.cc \

diff --cc gpsbabel.qrc
Simple merge

diff --cc reference/format0.txt
index bc13f7c0737029173b7f9805c8d2c4a4f597100d,6abff0eb8824dec04c674058858f8ac908df8155..bab7cd80080bf086d5d6bb60b6337595afb09642
--- 1/reference/format0.txt
--- 2/reference/format0.txt
+++ b/reference/format0.txt
@@@ -4,17 -4,24 +4,15 @@@ v900          Columbus/Visiontac V900 files (.c
  csv           Comma separated values
  iblue747      csv     Data Logger iBlue747 csv
  iblue757      csv     Data Logger iBlue757 csv
- gpl   gpl     DeLorme GPL
  saplus                DeLorme Street Atlas Plus
  saroute       anr     DeLorme Street Atlas Route
 -destinator_itn        dat     Destinator Itineraries (.dat)
 -destinator_poi        dat     Destinator Points of Interest (.dat)
 -destinator_trl        dat     Destinator TrackLogs (.dat)
 -easygps       loc     EasyGPS binary format
  exif  jpg     Embedded Exif-GPS data (.jpg)
 -energympro    cpo     Energympro GPS training watch
 -enigma        ert     Enigma binary waypoint file (.ert)
  shape shp     ESRI shapefile
 -f90g  map     F90G Automobile DVR GPS log file
  igc           FAI/IGC Flight Recorder Data Format
  garmin_fit    fit     Flexible and Interoperable Data Transfer (FIT) Activity file
 -flysight      csv     FlySight GPS File
  gpssim        gpssim  Franson GPSGate Simulation
 -fugawi        txt     Fugawi
  garmin301             Garmin 301 Custom position and heartrate
  garmin_g1000  csv     Garmin G1000 datalog input filter file
- glogbook      xml     Garmin Logbook XML
  gdb   gdb     Garmin MapSource - gdb
  garmin_txt    txt     Garmin MapSource - txt (tab delimited)
  garmin_poi            Garmin POI database

diff --cc reference/format1.txt
index 1af7caa7a6f3bc9e4fdc5c82c3b7fbc060c4b8fd,9edc3c951d193e916dffe328547c32593af4cf6f..26bee2d8d35fc14efd335d97445f46f811b6d2e5
--- 1/reference/format1.txt
--- 2/reference/format1.txt
+++ b/reference/format1.txt
@@@ -7,17 -7,24 +7,15 @@@ file  csv             Comma separated value
  internal      custom          Custom "Everything" Style
  file  iblue747        csv     Data Logger iBlue747 csv
  file  iblue757        csv     Data Logger iBlue757 csv
- file  gpl     gpl     DeLorme GPL
  file  saplus          DeLorme Street Atlas Plus
  file  saroute anr     DeLorme Street Atlas Route
 -file  destinator_itn  dat     Destinator Itineraries (.dat)
 -file  destinator_poi  dat     Destinator Points of Interest (.dat)
 -file  destinator_trl  dat     Destinator TrackLogs (.dat)
 -file  easygps loc     EasyGPS binary format
  file  exif    jpg     Embedded Exif-GPS data (.jpg)
 -file  energympro      cpo     Energympro GPS training watch
 -file  enigma  ert     Enigma binary waypoint file (.ert)
  file  shape   shp     ESRI shapefile
 -file  f90g    map     F90G Automobile DVR GPS log file
  file  igc             FAI/IGC Flight Recorder Data Format
  file  garmin_fit      fit     Flexible and Interoperable Data Transfer (FIT) Activity file
 -file  flysight        csv     FlySight GPS File
  file  gpssim  gpssim  Franson GPSGate Simulation
 -file  fugawi  txt     Fugawi
  file  garmin301               Garmin 301 Custom position and heartrate
  file  garmin_g1000    csv     Garmin G1000 datalog input filter file
- file  glogbook        xml     Garmin Logbook XML
  file  gdb     gdb     Garmin MapSource - gdb
  file  garmin_txt      txt     Garmin MapSource - txt (tab delimited)
  file  garmin_poi              Garmin POI database

diff --cc reference/format2.txt
index 26ad489ab65c9dd392ebbee56d509e05a25cfb96,f4d9462927beca3341964f8bc458dfa4e3eda624..ad23fc941ea5d6a5847edf96842520e6e243f81a
--- 1/reference/format2.txt
--- 2/reference/format2.txt
+++ b/reference/format2.txt
@@@ -7,17 -7,24 +7,15 @@@ file  rw----  csv             Comma separated value
  internal      rw----  custom          Custom "Everything" Style
  file  --rw--  iblue747        csv     Data Logger iBlue747 csv
  file  --rw--  iblue757        csv     Data Logger iBlue757 csv
- file  --rw--  gpl     gpl     DeLorme GPL
  file  rw----  saplus          DeLorme Street Atlas Plus
  file  --r---  saroute anr     DeLorme Street Atlas Route
 -file  ----rw  destinator_itn  dat     Destinator Itineraries (.dat)
 -file  rw----  destinator_poi  dat     Destinator Points of Interest (.dat)
 -file  --rw--  destinator_trl  dat     Destinator TrackLogs (.dat)
 -file  rw----  easygps loc     EasyGPS binary format
  file  rw----  exif    jpg     Embedded Exif-GPS data (.jpg)
 -file  --r---  energympro      cpo     Energympro GPS training watch
 -file  ----rw  enigma  ert     Enigma binary waypoint file (.ert)
  file  rwrwrw  shape   shp     ESRI shapefile
 -file  --r---  f90g    map     F90G Automobile DVR GPS log file
  file  --rwrw  igc             FAI/IGC Flight Recorder Data Format
  file  -wrw--  garmin_fit      fit     Flexible and Interoperable Data Transfer (FIT) Activity file
 -file  rw----  flysight        csv     FlySight GPS File
  file  -w-w-w  gpssim  gpssim  Franson GPSGate Simulation
 -file  rw----  fugawi  txt     Fugawi
  file  rw----  garmin301               Garmin 301 Custom position and heartrate
  file  --rw--  garmin_g1000    csv     Garmin G1000 datalog input filter file
- file  --rw--  glogbook        xml     Garmin Logbook XML
  file  rwrwrw  gdb     gdb     Garmin MapSource - gdb
  file  rwrwrw  garmin_txt      txt     Garmin MapSource - txt (tab delimited)
  file  rw----  garmin_poi              Garmin POI database

diff --cc reference/format3.txt
Simple merge

diff --cc reference/help.txt
Simple merge

diff --cc vecs.cc
index ed7577333aa19b026a67025768d936510b91b24b,9649ce9bdf266afa3323668a5dae90f5ad9fcdad..4f06c2d75d9a4c24847e4cbc7502e4efa06e136e
--- 1/vecs.cc
--- 2/vecs.cc
+++ b/vecs.cc
@@@ -86,8 -87,8 +85,7 @@@ extern ff_vecs_t holux_vecs
  extern ff_vecs_t tpg_vecs;
  extern ff_vecs_t tpo2_vecs;
  extern ff_vecs_t tpo3_vecs;
 -extern ff_vecs_t easygps_vecs;
  extern ff_vecs_t saroute_vecs;
- extern ff_vecs_t gpl_vecs;
  extern ff_vecs_t igc_vecs;
  extern ff_vecs_t brauniger_iq_vecs;
  extern ff_vecs_t mtk_vecs;
@@@ -119,11 -116,12 +113,9 @@@ extern ff_vecs_t lmx_vecs
  extern ff_vecs_t xol_vecs;
  extern ff_vecs_t navilink_vecs;
  extern ff_vecs_t ik3d_vecs;
 -extern ff_vecs_t destinator_poi_vecs;
 -extern ff_vecs_t destinator_itn_vecs;
 -extern ff_vecs_t destinator_trl_vecs;
  extern ff_vecs_t igo8_vecs;
  extern ff_vecs_t mapasia_tr7_vecs;
- extern ff_vecs_t gnav_trl_vecs;
  extern ff_vecs_t navitel_trk_vecs;
- extern ff_vecs_t ggv_ovl_vecs;
  extern ff_vecs_t itracku_vecs;
  extern ff_vecs_t itracku_fvecs;
  extern ff_vecs_t sbp_vecs;
@@@ -234,10 -231,11 +219,9 @@@ struct Vecs::Imp
    LegacyFormat format_garmin_xt_fmt {format_garmin_xt_vecs};
    GarminFitFormat format_fit_fmt;
    MapbarTrackFormat mapbar_track_fmt;
 -  F90gTrackFormat f90g_track_fmt;
    MapfactorFormat mapfactor_fmt;
 -  EnergymproFormat energympro_fmt;
    MyNavFormat mynav_fmt;
    GeoJsonFormat geojson_fmt;
-   GgvBinFormat ggv_bin_fmt;
    GlobalsatSportFormat globalsat_sport_fmt;
    QstarzBL1000Format qstarz_bl_1000_fmt;
  #endif // MAXIMAL_ENABLED